layout: Reset the OSK to the primary monitor when monitors change

When monitors change, the previous index might not mean the same
physical monitor anymore, in fact, it might become invalid. In the
latter case, we'll actually get a JS error when accessing
this.keyboardMonitor in _updateKeyboardBox() . To avoid this, let's
just always reset the OSK to the primary monitor.

https://bugzilla.gnome.org/show_bug.cgi?id=738536

diff --git a/js/ui/layout.js b/js/ui/layout.js
index c61376dd6f923c5e57c6e95942e91d623f87c76e..dda9fc7d6d3825616973b5093146c21524a76057 100644 (file)
--- a/js/ui/layout.js
+++ b/js/ui/layout.js
@@ -423,10 +423,7 @@ const LayoutManager = new Lang.Class({
         this.panelBox.set_position(this.primaryMonitor.x, this.primaryMonitor.y);
         this.panelBox.set_size(this.primaryMonitor.width, -1);
 
-        if (this.keyboardIndex < 0)
-            this.keyboardIndex = this.primaryIndex;
-        else
-            this._updateKeyboardBox();
+        this.keyboardIndex = this.primaryIndex;
 
         this.trayBox.set_position(this.bottomMonitor.x,
                                   this.bottomMonitor.y + this.bottomMonitor.height);